merge trunk
authorK. Handa <handa@gnu.org>
Fri, 10 May 2013 11:15:14 +0000 (20:15 +0900)
committerK. Handa <handa@gnu.org>
Fri, 10 May 2013 11:15:14 +0000 (20:15 +0900)

Trivial merge